some small cleanup, export script for scp

diff --git a/docs/meson.build b/docs/meson.build
index b1c04f6fa7347d67d611a3673254bbee886cc6d8..e021f71f71d6b335274614cb0449d72537201b15 100644 (file)
--- a/docs/meson.build
+++ b/docs/meson.build
@@ -14,6 +14,9 @@ index_static_html = configure_file(
   configuration: conf,
 )
 
+babl_path_src = join_paths(meson.source_root() + 'extensions')
+babl_path_bin = join_paths(meson.build_root()  + 'extensions')
+
 index_html = custom_target('index.html',
   input : [
     index_static_html,
@@ -23,40 +26,36 @@ index_html = custom_target('index.html',
   ],
   output: [ 'index.html', ],
   command: [
-
+    # cp $< $@
+    # (which mktemp > /dev/null 2>&1 && TMPFILE=`mktemp` || TMPFILE="/tmp/babl_build_tempfile" ;\
+    # export BABL_PATH="$(top_builddir)/extensions:$(top_builddir)/extensions/.libs"; $(babl_html_dump) > $$TMPFILE;\
+    # $(SHELL) $(top_srcdir)/docs/tools/xml_insert.sh $@ BablBase $$TMPFILE;\
+    # rm -f $$TMPFILE )
+    # echo -n "."
+    #
+    # $(SHELL) $(top_srcdir)/docs/tools/xml_insert.sh $@ AUTHORS $(top_srcdir)/AUTHORS
+    # $(SHELL) $(top_srcdir)/docs/tools/xml_insert.sh $@ TODO $(top_srcdir)/TODO
+    # $(SHELL) $(top_srcdir)/docs/tools/xml_insert.sh $@ NEWS $(top_srcdir)/NEWS
+    # echo " [OK]"
   ],
 )
 
-# push_web_root = custom_target('push_web_root',
-#   input : [
-#     index_html,
-#     index_static_html,
-#     'babl.css',
-#   ],
-#   output: [ 'push_web_root' ],
-#   command: [
-#     'scp',
-#     '@INPUT@',
-#     scptarget,
-#   ],
-# )
-# push_web_graphics = custom_target('push_web_graphics',
-#   input : [
-#     graphic_files_install,
-#   ],
-#   output: [ 'push_web_graphics' ],
-#   command: [
-#     'scp',
-#     '@INPUT@',
-#     scptarget + 'graphics/',
-#   ],
-# )
-#
-# web = custom_target('web',
-#   input: [
-#     push_web_root,
-#     push_web_graphics
-#   ],
-#   output: [],
-#   command: [],
-# )
\ No newline at end of file
+babl_css = files('babl.css')
+
+custom_target('push_web.sh',
+  input : [
+    index_html,
+    index_static_html,
+    babl_css,
+    graphic_files_install,
+  ],
+  output: [
+    'push_web.sh',
+  ],
+  command: [
+    'echo', '#!/bin/bash',
+    '\n' + 'scp', index_html, index_static_html, babl_css, scptarget,
+    '\n' + 'scp', graphic_files_install, scptarget + 'graphics/'
+  ],
+  capture: true,
+)

diff --git a/extensions/meson.build b/extensions/meson.build
index bfbbcc24b000561fec25b13bbb9f5134f37cbcca..d04ad671a2db87008e41f0579c4e417dab6bc982 100644 (file)
--- a/extensions/meson.build
+++ b/extensions/meson.build
@@ -37,9 +37,3 @@ foreach extension_name : extension_names
     install_dir: join_paths(get_option('libdir'), lib_name),
   )
 endforeach
-
-# sse2_float_la_CFLAGS = $(SSE2_EXTRA_CFLAGS)
-# sse2_int8_la_CFLAGS = $(SSE2_EXTRA_CFLAGS)
-# sse2_int16_la_CFLAGS = $(SSE2_EXTRA_CFLAGS)
-# sse4_int8_la_CFLAGS = $(SSE4_1_EXTRA_CFLAGS)
-# sse_half_la_CFLAGS = $(SSE4_1_EXTRA_CFLAGS) $(F16C_EXTRA_CFLAGS)

diff --git a/meson.build b/meson.build
index 6b2aa5d296ae4f98faa5118062a084841fb3bb28..01cf491f4d2237f8145e11f60a862e8d5351d367 100644 (file)
--- a/meson.build
+++ b/meson.build
@@ -1,6 +1,14 @@
-# Meson build file
-
-# http://bugzilla.gnome.org/enter_bug.cgi?product=GIMP
+project('babl', 'c',
+  license: 'GPL3+',
+  version: '0.1.39',
+  meson_version: '>=0.40.0',
+  default_options: [
+    'sysconfdir=/etc',
+    'localstatedir=/var',
+    'sharedstatedir=/var/lib'
+  ],
+  # http://bugzilla.gnome.org/enter_bug.cgi?product=GEGL
+)
 
 # Making releases on the stable branch:
 #   BABL_MICRO_VERSION += 1;
@@ -11,14 +19,6 @@
 # if backwards compatibility has been broken,
 #    set BABL_BINARY_AGE _and_ BABL_INTERFACE_AGE to 0.
 
-project('babl', 'c', version : '0.1.39',
-  meson_version : '>=0.40.0',
-  default_options : [
-    'sysconfdir=/etc',
-    'localstatedir=/var',
-    'sharedstatedir=/var/lib'
-  ],
-)
 
 conf = configuration_data()
 
@@ -38,18 +38,15 @@ array_version = version.split('.')
 major_version = array_version[0].to_int()
 minor_version = array_version[1].to_int()
 micro_version = array_version[2].to_int()
-
 interface_age = 1
+
 binary_age = 100 * minor_version + micro_version
 
-lt_current = 100 * minor_version + micro_version - interface_age
-lt_revision = interface_age
-lt_age = binary_age - interface_age
-lt_current_minus_age = lt_current - lt_age
+lt_current = binary_age - interface_age
 
 api_version = '@0@.@1@'.format(major_version, minor_version)
-lib_version = '@0@:@1@:@2@'.format(lt_current, lt_revision, lt_age)
-so_version  = '@0@.@1@.@2@'.format(lt_current_minus_age, lt_current, interface_age)
+lib_version = '@0@:@1@:@2@'.format(lt_current, interface_age, lt_current)
+so_version  = '@0@.@1@.@2@'.format(0, lt_current, interface_age)
 lib_name    = meson.project_name() + '-' + api_version
 
 stability_version_number = (major_version != 0 ? minor_version : micro_version)
@@ -67,7 +64,7 @@ conf.set_quoted('BABL_REAL_VERSION',     '@0@'.format(version))
 conf.set_quoted('BABL_API_VERSION',      '@0@'.format(api_version))
 conf.set_quoted('BABL_RELEASE',          '@0@'.format(api_version))
 conf.set_quoted('BABL_LIBRARY_VERSION',  '@0@'.format(lib_version))
-conf.set_quoted('BABL_CURRENT_MINUS_AGE','@0@'.format(lt_current_minus_age))
+conf.set_quoted('BABL_CURRENT_MINUS_AGE','@0@'.format(0))
 conf.set_quoted('BABL_LIBRARY',          '@0@'.format(lib_name))
 
 ################################################################################
@@ -139,7 +136,7 @@ endforeach
 # Check for compiler CPU extensions
 
 have_tls_run = cc.run('int main() { static __thread char buf[1024]; return 0; }')
-have_tls = (have_tls_run.compiled() and have_tls_run.returncode() == 0)
+conf.set('HAVE_TLS', (have_tls_run.compiled() and have_tls_run.returncode() == 0))
 
 has_ssem = cc.has_argument('-mfpmath=sse')
 if has_ssem
@@ -183,8 +180,8 @@ if not (have_dlfcn_h or have_dl_h)
   error('Header dlfcn.h or dl.h not provided. Please provide one of them.')
 endif
 
-conf.set10('HAVE_DLFCN_H', have_dlfcn_h)
-conf.set10('HAVE_DL_H', have_dl_h)
+conf.set('HAVE_DLFCN_H', have_dlfcn_h)
+conf.set('HAVE_DL_H', have_dl_h)
 
 
 shared_lib_ext = (platform_win32 ? '.dll' : '.so')
@@ -197,7 +194,6 @@ rsvg_convert = find_program('rsvg-convert', required: false)
 w3m          = find_program('w3m', required: false)
 
 
-
 ################################################################################
 # Dependencies